Skip to content

32 Add minor reservoirs to hydrology - #143

Draft
Katie Blackford (KatieBlackford) wants to merge 28 commits into
MetOffice:mainfrom
KatieBlackford:vn8.2_minor_reservoirs
Draft

32 Add minor reservoirs to hydrology#143
Katie Blackford (KatieBlackford) wants to merge 28 commits into
MetOffice:mainfrom
KatieBlackford:vn8.2_minor_reservoirs

Conversation

@KatieBlackford

@KatieBlackford Katie Blackford (KatieBlackford) commented Aug 21, 2026

Copy link
Copy Markdown

PR Summary

The code allows for minor reservoirs, these are defined as small water bodies that are not on the main river stem but collect and retain local runoff which is then available for water abstractions.

Closes #32

Sci/Tech Reviewer:
Code Reviewer:

Code Quality Checklist

(Some checks are automatically carried out via the CI pipeline)

  • I have performed a self-review of my own code
  • My code follows the project's style guidelines
  • Comments have been included that aid understanding and enhance the readability of the code
  • My changes generate no new warnings
  • If editing rose-meta/jules-shared then have you supplied a linked UM and LFRic Apps PR?

Testing

  • I have tested this change locally, using the JULES rose-stem suite
  • If shared files have been modified, I have run the UM and LFRic Apps rose stem suites
  • If any tests fail (rose-stem or CI) the reason is understood and acceptable (eg. kgo changes)
  • I have added tests to cover new functionality as appropriate (eg. system tests, unit tests, etc.)

trac.log

Test Suite Results - jules - vn8.2_minor_reservoirs_test/run4

Suite Information

Item Value
Suite Name vn8.2_minor_reservoirs_test/run4
Suite User katbla6
Workflow Start 2026-08-28T09:47:10
Groups Run all
Dependency Reference Main Like
jules KatieBlackford/jules@vn8.2_minor_reservoirs_test False
SimSys_Scripts MetOffice/SimSys_Scripts@2026.07.1 True

Task Information

✅ succeeded tasks - 213

Security Considerations

  • I have reviewed my changes for potential security issues
  • Sensitive data is properly handled (if applicable)
  • Authentication and authorisation are properly implemented (if applicable)

Performance Impact

  • Performance of the code has been considered and, if applicable, suitable performance measurements have been conducted

AI Assistance and Attribution

  • Some of the content of this change has been produced with the assistance of Generative AI tool name (e.g., Met Office Github Copilot Enterprise, Github Copilot Personal, ChatGPT GPT-4, etc) and I have followed the Simulation Systems AI policy (including attribution labels)

Documentation

  • Where appropriate I have updated documentation related to this change and confirmed that it builds correctly

Approvals

Please request all relevant approvals. See the CodeOwners.txt file for section owners.

Technical

  • JULES Code Owner
  • OpenMP
  • River Routing
  • Rose Stem
  • Rose Metadata
  • Upgrade Macros

Scientific

  • Surface
  • Hydrology
  • Vegetation
  • Veg3 RED Demography
  • Biogeochemistry
  • Biogenic fluxes
  • Fire
  • Lakes
  • Evaluation
  • Imogen

Sci/Tech Review

  • I understand this area of code and the changes being added
  • The proposed changes correspond to the pull request description
  • Documentation is sufficient (do documentation papers need updating)
  • Sufficient testing has been completed

Please alert the code reviewer via a tag when you have approved the SR

Code Review

  • All dependencies have been resolved
  • Related Issues have been properly linked and addressed
  • CLA compliance has been confirmed
  • Code quality standards have been met
  • Tests are adequate and have passed
  • Documentation is complete and accurate
  • Security considerations have been addressed
  • Performance impact is acceptable

Phil Harris (ppharris) and others added 25 commits March 2, 2026 16:44
Co-authored-by: James Bruten <109733895+james-bruten-mo@users.noreply.github.com>
…de to rivers code) as a variable on "global" land points rather than scattering and then regathering.
return_flow_sw now called return_flow_river for clarity.
Updates from config-dump and metadata-check.
…ble, before a later decision based on configuration. Makes coupling slightly more clear/clean.

Also tidying and adding DrHook (right now I'm bemused as to how some bits were compilable previously).
@github-actions github-actions Bot added the cla-signed The CLA has been signed as part of this PR - added by GA label Aug 21, 2026
@doucla Douglas Clark (doucla) added this to the Autumn 2026 milestone Aug 21, 2026
@doucla Douglas Clark (doucla) added the Linked UM This PR is linked to a MetOffice/um PR label Aug 21, 2026
@doucla Douglas Clark (doucla) added the macro This PR contains a metadata upgrade macro label Aug 21, 2026
@KatieBlackford
Katie Blackford (KatieBlackford) changed the base branch from stable to main August 21, 2026 15:30
Comment thread src/io/model_interface/extract_var.inc Outdated
Comment thread rose-meta/jules-standalone/versions.py Outdated
Comment thread rose-meta/jules-standalone/versions.py Outdated
Comment thread rose-meta/jules-standalone/versions.py Outdated

@doucla Douglas Clark (doucla) left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Katie - Having found a "comment" feature in GitHub I thought I would try to use it for a couple of comments. It seems that the process will result in me submitting a "review", which wasn't quite what I imagined! Hopefully this will work/be OK for you.

Co-authored-by: Douglas Clark <dbcl@ceh.ac.uk>
@KatieBlackford Katie Blackford (KatieBlackford) changed the title Vn8.2 minor reservoirs 32 Add minor reservoirs to hydrology Aug 25, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla-signed The CLA has been signed as part of this PR - added by GA Linked UM This PR is linked to a MetOffice/um PR macro This PR contains a metadata upgrade macro

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Add minor reservoirs to hydrology (old ticket #1123)

5 participants